diff --git a/init/init-home.el b/init/init-home.el
index 5326ceb..e5d2a71 100644
--- a/init/init-home.el
+++ b/init/init-home.el
@@ -252,6 +252,17 @@
 (set-default-font "Source Code Variable-12")
 
 ;;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;;
+;; Emacsclient workaround for nlinum
+;;'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''';;
+(defun initialize-nlinum (&optional frame)
+  (require 'nlinum)
+  (add-hook 'prog-mode-hook 'nlinum-mode))
+(when (daemonp)
+  (add-hook 'window-setup-hook 'initialize-nlinum)
+  (defadvice make-frame (around toggle-nlinum-mode compile activate)
+    (nlinum-mode -1) ad-do-it (nlinum-mode 1)))
+
+;;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;;
 ;; Maximise Emacs
 ;;'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''';;
 (add-to-list 'default-frame-alist '(fullscreen . maximized))
diff --git a/init/init-work.el b/init/init-work.el
index ccdb394..ef59d59 100644
--- a/init/init-work.el
+++ b/init/init-work.el
@@ -247,11 +247,22 @@
 ;;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;;
 ;; Furter customization for linum and left margin width
 ;;'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''';;
-;(eval-after-load "linum"
-;  '(set-face-attribute 'linum nil :height 80))
+(eval-after-load "nlinum"
+  '(set-face-attribute 'linum nil :height 80))
 (set-default-font "Source Code Pro-12")
 
 ;;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;;
+;; Emacsclient workaround for nlinum
+;;'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''';;
+(defun initialize-nlinum (&optional frame)
+  (require 'nlinum)
+  (add-hook 'prog-mode-hook 'nlinum-mode))
+(when (daemonp)
+  (add-hook 'window-setup-hook 'initialize-nlinum)
+  (defadvice make-frame (around toggle-nlinum-mode compile activate)
+    (nlinum-mode -1) ad-do-it (nlinum-mode 1)))
+
+;;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;;
 ;; Maximise Emacs
 ;;'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''';;
 (add-to-list 'default-frame-alist '(fullscreen . maximized))